From e2d760b37398feeb13b1512ba7cbba82ec228e2c Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 23 Nov 2009 06:43:50 +0000 Subject: [PATCH] x86 shadow: Relax assertion in VRAM tracking code The original assertion is too strict, as it includes the A/D bits of the PTE, which (by design) can change under our feet. Signed-off-by: Tim Deegan --- xen/arch/x86/mm/shadow/multi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 4675eab675..580c757a21 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -1117,7 +1117,8 @@ static inline void shadow_vram_put_l1e(shadow_l1e_t old_sl1e, } else { - ASSERT(dirty_vram->sl1ma[i] == sl1ma); + ASSERT((dirty_vram->sl1ma[i] & PAGE_MASK) + == (sl1ma & PAGE_MASK)); dirty_vram->sl1ma[i] = INVALID_PADDR; if ( flags & _PAGE_DIRTY ) dirty = 1; -- 2.30.2